From 2d9c9413ab7c7a1184a66eec44f48a3044a36242 Mon Sep 17 00:00:00 2001
From: Hollis Blanchard <hollisb@us.ibm.com>
Date: Mon, 16 Jul 2007 14:20:16 -0500
Subject: [PATCH] [POWERPC][XEN] Use top-level CFLAGS. - Append to CFLAGS
 instead of replacing it. - Fix newly-exposed mixed statement/declaration
 warnings.

---
 xen/arch/powerpc/Rules.mk          |  4 ++--
 xen/arch/powerpc/mpic_init.c       |  4 +++-
 xen/arch/powerpc/of-devtree.c      |  2 +-
 xen/arch/powerpc/of-devwalk.c      |  8 +++-----
 xen/arch/powerpc/of_handler/ofh.c  | 24 ++++--------------------
 xen/arch/powerpc/ofd_fixup.c       |  9 ++++++---
 xen/include/asm-powerpc/xenoprof.h |  2 +-
 7 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/xen/arch/powerpc/Rules.mk b/xen/arch/powerpc/Rules.mk
index fd26632ae6..49e0e5477a 100644
--- a/xen/arch/powerpc/Rules.mk
+++ b/xen/arch/powerpc/Rules.mk
@@ -9,8 +9,8 @@ C_WARNINGS := -Wredundant-decls
 # _no_ common code can have packed data structures or we are in touble.
 C_WARNINGS += -Wpacked
 
-CFLAGS := -m64 -ffreestanding -fno-builtin -fno-common
-CFLAGS += -iwithprefix include -Wall -Werror -pipe
+CFLAGS += -m64 -ffreestanding -fno-builtin -fno-common
+CFLAGS += -iwithprefix include -Werror -pipe
 CFLAGS += -I$(BASEDIR)/include
 CFLAGS += -I$(BASEDIR)/include/asm-powerpc/mach-generic
 CFLAGS += -I$(BASEDIR)/include/asm-powerpc/mach-default
diff --git a/xen/arch/powerpc/mpic_init.c b/xen/arch/powerpc/mpic_init.c
index 22952f54fe..f4e4074ae1 100644
--- a/xen/arch/powerpc/mpic_init.c
+++ b/xen/arch/powerpc/mpic_init.c
@@ -153,13 +153,15 @@ static unsigned long find_ranges_addr_from_node(void *oft_p, ofdn_t c)
     u32 addr_c = 2;
     u32 ranges[64];
     int p_len;
+    int i;
 
     parent = ofd_node_parent(oft_p, c);
     parent = ofd_node_parent(oft_p, parent);
 
     p_len = ofd_getprop(oft_p, parent, "ranges", &ranges, sizeof(ranges));
     DBG("%s: ranges\n", __func__);
-    int i; for (i=0; i<p_len; i++) {DBG("%08x ", ranges[i]);}
+    for (i=0; i<p_len; i++)
+        DBG("%08x ", ranges[i]);
     DBG("\n");
 
     p_len = ofd_getprop(oft_p, parent, "#address-cells",
diff --git a/xen/arch/powerpc/of-devtree.c b/xen/arch/powerpc/of-devtree.c
index c437ef4569..ff5efdff16 100644
--- a/xen/arch/powerpc/of-devtree.c
+++ b/xen/arch/powerpc/of-devtree.c
@@ -939,12 +939,12 @@ ofdn_t ofd_node_find_by_prop(
     size_t sz)
 {
     struct ofd_mem *m = (struct ofd_mem *)mem;
+    ofdn_t prev = -1;
 
     if ( n <= 0 ) {
         n = OFD_ROOT;
     }
 
-    ofdn_t prev = -1;
     return ofd_find_by_prop(m, -1, &prev, n, name, val, sz);
 }
 
diff --git a/xen/arch/powerpc/of-devwalk.c b/xen/arch/powerpc/of-devwalk.c
index 3f63697f13..697ebb1901 100644
--- a/xen/arch/powerpc/of-devwalk.c
+++ b/xen/arch/powerpc/of-devwalk.c
@@ -32,13 +32,13 @@ void ofd_prop_print(
     const char *prop,
     size_t sz)
 {
+#define DEBUG_PROP
+#ifndef DEBUG_PROP
     if ( path[0] == '/' && path[1] == '\0' ) {
         path = "";
     }
     printk("%s: %s/%s: 0x%lx\n", head, path,  name, sz);
-
-#define DEBUG_PROP
-#ifdef DEBUG_PROP
+#else
     int i;
     int isstr = sz;
     const char *b = prop;
@@ -75,8 +75,6 @@ void ofd_prop_print(
         }
         printk("\n");
     }
-#else
-    (void)prop;
 #endif
 }
 
diff --git a/xen/arch/powerpc/of_handler/ofh.c b/xen/arch/powerpc/of_handler/ofh.c
index 84ea27fb4f..06d700eaa9 100644
--- a/xen/arch/powerpc/of_handler/ofh.c
+++ b/xen/arch/powerpc/of_handler/ofh.c
@@ -50,30 +50,14 @@ s32 debug(const char *fmt, ...)
 void
 assprint(const char *expr, const char *file, int line, const char *fmt, ...)
 {
-    char a[15];
-
-    a[0]  = '\n';
-    a[1]  = '\n';
-    a[2]  = 'O';
-    a[3]  = 'F';
-    a[4]  = 'H';
-    a[5]  = ':';
-    a[6]  = 'A';
-    a[7]  = 'S';
-    a[8]  = 'S';
-    a[9]  = 'E';
-    a[10] = 'R';
-    a[11] = 'T';
-    a[12] = '!';
-    a[13] = '\n';
-    a[14] = '\n';
-
+    char a[15] = {
+       '\n', '\n', 'O', 'F', 'H', ':', 'A', 'S', 'S', 'E', 'R', 'T', '!',
+       '\n', '\n',
+    };
     s32 actual;
     u32 t = 1;
     volatile u32 *tp = &t;
 
-    (void)expr; (void)file; (void)line; (void)fmt;
-
     ofh_cons_write(a, sizeof (a), &actual);
 
     /* maybe I can break out of this loop manually (like with a
diff --git a/xen/arch/powerpc/ofd_fixup.c b/xen/arch/powerpc/ofd_fixup.c
index 6deb3c888c..b2432aade9 100644
--- a/xen/arch/powerpc/ofd_fixup.c
+++ b/xen/arch/powerpc/ofd_fixup.c
@@ -363,9 +363,12 @@ static ofdn_t ofd_xen_props(void *m, struct domain *d, ulong shared_info)
 ulong ofd_dom0_fixup(struct domain *d, ulong mem, const char *cmdline,
                      ulong shared_info)
 {
+    const char compat[] = "Hypervisor,Maple";
+    const char d0[] = "dom0";
     void *m;
     const ofdn_t n = OFD_ROOT;
     ofdn_t r;
+    u32 did;
 
     m = (void *)mem;
 
@@ -404,16 +407,16 @@ ulong ofd_dom0_fixup(struct domain *d, ulong mem, const char *cmdline,
     rtas_proxy_init(m);
 
 #ifdef FIX_COMPAT 
-    const char compat[] = "Hypervisor,Maple";
     r = ofd_prop_add(m, n, "compatible", compat, sizeof (compat));
     ASSERT( r > 0 );
+#else
+    (void)compat;
 #endif
 
-    u32 did = d->domain_id;
+    did = d->domain_id;
     r = ofd_prop_add(m, n, "ibm,partition-no", &did, sizeof(did));
     ASSERT( r > 0 );
 
-    const char d0[] = "dom0";
     r = ofd_prop_add(m, n, "ibm,partition-name", d0, sizeof (d0));
     ASSERT( r > 0 );
 
diff --git a/xen/include/asm-powerpc/xenoprof.h b/xen/include/asm-powerpc/xenoprof.h
index 3d17cc5193..195796e5d1 100644
--- a/xen/include/asm-powerpc/xenoprof.h
+++ b/xen/include/asm-powerpc/xenoprof.h
@@ -83,7 +83,7 @@ static inline void ctr_write(unsigned int i, unsigned int val)
     }
 }
 
-static inline void print_perf_status()
+static inline void print_perf_status(void)
 {
     ulong mmcr0 = mfmmcr0();
     ulong mmcr1 = mfmmcr1();
-- 
2.30.2